From: Kenichi Handa <handa@gnu.org>
Date: Thu, 23 May 2013 12:04:26 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3615^2~227
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=179a3f11d15cbc6e433f05e03cc7e40fd5ce8362;p=emacs.git

merge trunk
---

179a3f11d15cbc6e433f05e03cc7e40fd5ce8362